demos: Always build font explorer demo

We are no longer using PangoFT2 APIs in this demo, so make sure that we build
it on all builds since we already depend on a HarfBuzz/Pango version that
provide everything that we need here.

Drop the unnecessary pangofc-font.h include as a result.

diff --git a/demos/gtk-demo/font_features.c b/demos/gtk-demo/font_features.c
index 4c3af558e7ff49329647aaea7e98a05afb5c1a77..074e604ed1df4083099e730f0e3ad4ee0b92d4b4 100644 (file)
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -12,7 +12,6 @@
  */
 
 #include <gtk/gtk.h>
-#include <pango/pangofc-font.h>
 #include <hb.h>
 #include <hb-ot.h>
 #include <glib/gi18n.h>

diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index 5b79dfad5f2cf746befa0062bd7b812f690348a3..5c84a0121d33b7d73a18cca26b28a310d5e59972 100644 (file)
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -98,6 +98,7 @@ demos = files([
   'transparent.c',
   'tree_store.c',
   'video_player.c',
+  'font_features.c',
 ])
 
 gtkdemo_deps = [ libgtk_dep, ]
@@ -128,14 +129,9 @@ extra_demo_sources = files([
   'script-names.c',
   'unicode-names.c',
   'suggestionentry.c',
+  'language-names.c',
 ])
 
-if harfbuzz_dep.found() and pangoft_dep.found()
-  demos += files(['font_features.c'])
-  extra_demo_sources += files(['language-names.c'])
-  gtkdemo_deps += [ harfbuzz_dep, epoxy_dep ]
-endif
-
 if os_unix
   demos += files('pagesetup.c')
 endif